From: Florian Müllner <fmuellner@gnome.org>
Date: Sun, 25 Aug 2019 13:57:11 +0000 (+0300)
Subject: st: Adjust theme test
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~827^2^2~22
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=957fa910b32ac4a2e132c5d86dcff1dfd180fe48;p=gnome-shell.git

st: Adjust theme test

Mutter's Clutter fork can no longer be initialized separatedly, as
its backend now draws from MetaBackend. Adjust the code to use the
newly added test initialization function instead to get the test
back up.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/691
---

diff --git a/src/st/meson.build b/src/st/meson.build
index 1097a54c8..764ff0db4 100644
--- a/src/st/meson.build
+++ b/src/st/meson.build
@@ -136,7 +136,7 @@ libst_dep = declare_dependency(link_with: libst,
 test_theme = executable('test-theme',
   sources: 'test-theme.c',
   c_args: st_cflags,
-  dependencies: [clutter_dep, gtk_dep],
+  dependencies: [mutter_dep, gtk_dep],
   build_rpath: mutter_typelibdir,
   link_with: libst
 )
diff --git a/src/st/test-theme.c b/src/st/test-theme.c
index 0d6acd135..bd422da00 100644
--- a/src/st/test-theme.c
+++ b/src/st/test-theme.c
@@ -25,6 +25,7 @@
 #include "st-button.h"
 #include <math.h>
 #include <string.h>
+#include <meta/main.h>
 
 static ClutterActor *stage;
 static StThemeNode *root;
@@ -536,11 +537,16 @@ main (int argc, char **argv)
   StThemeContext *context;
   PangoFontDescription *font_desc;
   GFile *file;
+  g_autofree char *cwd = NULL;
 
   gtk_init (&argc, &argv);
 
-  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
-    return 1;
+  /* meta_init() cds to $HOME */
+  cwd = g_get_current_dir ();
+
+  meta_test_init ();
+
+  chdir (cwd);
 
   /* Make sure our assumptions about resolution are correct */
   g_object_set (clutter_settings_get_default (), "font-dpi", -1, NULL);